From 26bee389365f359b5f2fca829db57f9ec829f467 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Tue, 6 Jul 2004 19:33:41 +0000 Subject: [PATCH] bitkeeper revision 1.1041.1.16 (40eafe95g-dX5S31rejiqR_01dEwUQ) Minor ACPI tweaks to move ever so slightly toward 2.6 and make ia64 (based on 2.6) easier. --- xen/include/acpi/acpi_bus.h | 2 -- xen/include/asm-x86/acpi.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/include/acpi/acpi_bus.h b/xen/include/acpi/acpi_bus.h index 50eaf61c0a..4326bc934b 100644 --- a/xen/include/acpi/acpi_bus.h +++ b/xen/include/acpi/acpi_bus.h @@ -36,8 +36,6 @@ #include -extern int acpi_disabled; - /* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10 struct acpi_handle_list { diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index 35d45f4151..be7d6dfda7 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -108,6 +108,7 @@ extern int acpi_lapic; extern int acpi_ioapic; extern int acpi_noirq; +extern int acpi_disabled; /* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */ #define FIX_ACPI_PAGES 4 -- 2.30.2